From: Keir Fraser <keir@xensource.com>
Date: Tue, 2 Oct 2007 08:27:22 +0000 (+0100)
Subject: xend: Fix refactoring done in CS 15938 in security.py.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14929^2~16
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=ece8f4f2592288a1511afabc6ed35cbb2ef7c8b0;p=xen.git

xend: Fix refactoring done in CS 15938 in security.py.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
---

diff --git a/tools/python/xen/util/xsm/acm/acm.py b/tools/python/xen/util/xsm/acm/acm.py
index 52f6ad6333..d58652e06c 100644
--- a/tools/python/xen/util/xsm/acm/acm.py
+++ b/tools/python/xen/util/xsm/acm/acm.py
@@ -1309,7 +1309,7 @@ def parse_security_label(security_label):
         return security_label
 
 def set_security_label(policy, label):
-    if label != "" and policy != "":
+    if label and policy and label != "" and policy != "":
         return "%s:%s:%s" % (xsconstants.ACM_POLICY_ID, policy, label)
     else:
         return ""